Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship>
Tue, 13 Apr 2010 12:24:53 +0000 (12:24 +0000)
committerKatsumi Yamaoka <katsumi@flagship>
Tue, 13 Apr 2010 12:24:53 +0000 (12:24 +0000)
commitbae0cfd3e7422f1a5c786a9186682d1e156c627e
treeafe11df2755188bd0aa6810b0bcebd85b14eee85
parent1ac7833cb4fa0741de457f89316383f7cc1f28cb
parent9bedd2585e34e76a6afa951b39536845e2bc1349
Merge from mainline.